Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Wed, 16 May 2012 19:16:00 +0000 (21:16 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Wed, 16 May 2012 19:16:00 +0000 (21:16 +0200)

Trivial merge